From 4bfa300850045dcd7c974bdd128adef13f2777b1 Mon Sep 17 00:00:00 2001
From: Lukas Schmelting <lschmelting@posteo.com>
Date: Thu, 27 Nov 2025 23:58:32 +0100
Subject: [PATCH] screenShield: Avoid unfocused authentication view after
 resume
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

When suspending on the authentication page of the lock screen in a user
session, the session resumes with the authentication dialog shown but
its password entry field unfocused. Instead, focus moves to the
authentication dialog itself while _ensureUnlockDialog() in
screenShield.js is called on resume.

Avoid this edge case by switching to the clock view instead before
suspend, which also provides a more consistent user experience.

Co-authored-by: Florian Müllner <fmuellner@gnome.org>
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3962>
---
 js/ui/screenShield.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 2e3b33197..65f2e6227 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -244,6 +244,7 @@ export class ScreenShield extends Signals.EventEmitter {
 
     _prepareForSleep(loginManager, aboutToSuspend) {
         if (aboutToSuspend) {
+            this._dialog?.cancel();
             if (this._settings.get_boolean(LOCK_ENABLED_KEY))
                 this.lock(true);
         } else {
-- 
2.39.5